`web-sys` services conversion #827

daxpedda · 2019-12-27T11:08:00Z

Make services work with web-sys.

Cc #558, ~~#826, #813, #817, #818~~, #841, #862, #867, #868.

daxpedda · 2019-12-31T16:01:50Z

I had to do some funny things with an AtomicBool and a mpsc to be able to clean up the memory of created closures.
It works fine, but if somebody has an idea how to do it differently I am all ears.

src/services/storage.rs

src/services/websocket.rs

daxpedda · 2020-01-09T09:45:29Z

I was going through the unwraps here, but looking through the JS API all of these calls should not be able to fail, this is just an WebIDL thing as far as I can tell, but I am not sure.

I can still replace all unwraps with expects if it's desired.

jstarry

I was going through the unwraps here, but looking through the JS API all of these calls should not be able to fail, this is just an WebIDL thing as far as I can tell, but I am not sure.

I can still replace all unwraps with expects if it's desired.

Yeah, it's hard to tell. I was going back and forth on this for append_child. Couldn't find anything that would indicate that it would ever fail. I would err on the side of expressive expects but wouldn't push back if you went with unwraps at your discretion.

I added a comment on the dialog service, window() is not accessible from the worker context so that unwrap should definitely be an expect

src/services/dialog.rs

daxpedda · 2020-01-09T10:05:28Z

I would err on the side of expressive expects but wouldn't push back if you went with unwraps at your discretion.

Personally I never use unwraps in my codebases, I was just following the code practices in yew.
So feel free to tell me to change everything to expects if you want to.

daxpedda · 2020-01-09T14:56:16Z

Converted everything to use cfg_if and cfg_match.

jstarry

Great work @daxpedda! I added a few comments and have some requests for handling the fetch and reader services:

I think they should separate the web-sys and stdweb implementations since they are more complex than the other services
I would like those services to be removed from this PR and introduced as separate PRs (one for fetch and one for reader)
In this PR, annotate these two services with stdweb cfg so that the services module compiles on web-sys

Thoughts?

src/services/fetch.rs

src/services/interval.rs

src/services/reader.rs

src/services/storage.rs

src/services/websocket.rs

daxpedda · 2020-01-12T11:30:19Z

In this PR, annotate these two services with stdweb cfg so that the services module compiles on web-sys

Not sure what exactly you mean with that.
Is the current solution acceptable?

jstarry · 2020-01-15T11:15:47Z

Not sure what exactly you mean with that.

I'd like to get the web-sys branch to pass CI so was hoping you could add #[cfg(feature = "std_web")] here and here

jstarry · 2020-01-15T11:24:55Z

I would like those services to be removed from this PR and introduced as separate PRs (one for fetch and one for reader)

@daxpedda sorry I meant remove the changes to fetch and reader services. The stdweb implementation can stay, we just need to add #[cfg(feature = "std_web")] in services/mod.rs as I mentioned here: #827 (comment)

daxpedda · 2020-01-15T13:58:00Z

@daxpedda sorry I meant remove the changes to fetch and reader services. The stdweb implementation can stay, we just need to add #[cfg(feature = "std_web")] in services/mod.rs as I mentioned here: #827 (comment)

Ahahaha, misunderstanding galore, gonna revert my work here 🤣.

jstarry · 2020-01-15T14:26:18Z

Haha 😂 no worries, thanks for fixing so quickly 😄

* Enable travis * `web-sys` general conversion (#826) * Moved patches from different PRs. * Add bits & pieces and some services. * Rename `stdweb` feature to `std_web`. * Move tests and examples to different PR. * Revert some `cargo_web` handling removal. * Missed something. * Implement `console_error_panic_hook`. * Update Cargo.toml Co-authored-by: Justin Starry <justin.m.starry@gmail.com> * Move document creation to util convenience method (#855) * `web-sys` listener conversion (#813) * `web-sys` listener initial try. * Improve macros? * Remove generic from `EventListenerHandle`. * Fix build. * A cleaner solution? * Even cleaner. * Fix `build.rs`. * Minor improvements. * Following the yew toml style. * Fixing visibility. * Fix `rustfmt`. * Add `web-sys` re-exports. * Move general changes to different PR. * Remove compat. * Actually remove `compat.rs`. * Rename `stdweb` feature to `std_web`. * Move to gloo's `EventListener` and some polish. * Remove outdated comment. * Change `EventHandler` to be cancelled on drop. * `web-sys` html conversion (#817) * Converting all `html` parts. * Format. * Move general changes to different PR. * Removed compat. * Rename `stdweb` feature to `std_web`. * Remove redudant function copy. * Some polish. * Move to gloo's `EventListener`. * Replace `unwrap`s with `expect`s. * `web-sys` agent conversion (#818) * Converting `agent`. * Remove wrong `cfg` in imports. * Move general changes to different PR. * Some optimisations. * Rename `stdweb` feature to `std_web`. * Fix `ArrayBuffer` to `Uint8Array` conversions. * Add js module worker. * Use `cfg-if`` and `cfg-match` to make things clearer. * Fix `std_web` build. * Add some polish. * Add build guards for invalid build configs (#866) * `web_sys` cfg conversion (#862) * Use `cfg-if` and `cfg-match` and some polish. * Mistakes were made. * Missed line during rebasing. * Mistakes were undone. * Remove global. * Remove part of `global!`. * `web-sys` services conversion (#827) * Convert `console`. * Finish services. * Some polish. * Fix `ArrayBuffer` to `Uint8Array` conversions. * Fix aborting fetch leading to error and some polish. * Replaced some `unwrap`s with `expect`s. * Use `cfg_if` and `cfg_match` and do some polish. * Proper scoping. * Some fixes. * Move fetch and reader services to different PR. * Revert split. * Fix CI builds (#877) * Fix derive_props_test * Move tests (#897) (#898) * `web-sys` fetch service conversion (#867) * Split implementation. * Import global. * Import global. * Revert split. * Make fetch available again. * Revert "Revert split." This reverts commit 6e3f101. * Re-revert split. * Some polish. * Move to `wasm_bindgen_futures`. * Switch to `thiserror`. * wip * Update src/services/fetch/web_sys.rs Co-Authored-By: daxpedda <daxpedda@gmail.com> * Some more polish. Co-authored-by: Justin Starry <justin.m.starry@gmail.com> * `web-sys` reader service conversion (#868) * Split reader implementation. * Revert split. * Remove leftover files. * Make reader available again. * Revert "Revert split." This reverts commit 8abdc9c. * Revert "Remove leftover files." This reverts commit 188c6eb. * Re-revert split. * Polish. * Forgot some part. * Some polish. * Some polish. * `web-sys` examples/tests conversion (#841) * Fix examples/tests to work with `web_sys`. * Update `StorageService` usage. * Split `stdweb` and `web-sys` examples. * Fixing the shell script. * Trying to reset file permissions. * Update to new reader API. * Update to new fetch API. * Update to new fetch API. * Re-enable examples CI. * Deleted duplicate example. * Some fixes. * Fix rand build. * Fix spawning workers in combination with `wasm-bindgen`. (#901) * Fix component rendering process (#913) * wip * Fix component rendering process * Simplify yew-macro a bit (#902) * yew-macro: Simplify Properties validation * Fix most clippy warnings * Fix clippy warnings (#912) * Import Task trait in dashboard example * Remove duplicate vtag tests * Fix prevent_default() by non-passive (#958) * Fix prevent_default() by non-passive * Fix cargo fmt * Remove `Option` from most services. * Remove `Option` from resize service. * Apply fetch changes. * Apply reader service changes. * Fix `node_refs` example. * Remove web-sys travis branch Co-authored-by: daxpedda <daxpedda@gmail.com> Co-authored-by: Jonas Platte <jplatte@users.noreply.github.com> Co-authored-by: Jet Li <jing.i.qin@icloud.com>

* Enable travis * `web-sys` general conversion (yewstack#826) * Moved patches from different PRs. * Add bits & pieces and some services. * Rename `stdweb` feature to `std_web`. * Move tests and examples to different PR. * Revert some `cargo_web` handling removal. * Missed something. * Implement `console_error_panic_hook`. * Update Cargo.toml Co-authored-by: Justin Starry <justin.m.starry@gmail.com> * Move document creation to util convenience method (yewstack#855) * `web-sys` listener conversion (yewstack#813) * `web-sys` listener initial try. * Improve macros? * Remove generic from `EventListenerHandle`. * Fix build. * A cleaner solution? * Even cleaner. * Fix `build.rs`. * Minor improvements. * Following the yew toml style. * Fixing visibility. * Fix `rustfmt`. * Add `web-sys` re-exports. * Move general changes to different PR. * Remove compat. * Actually remove `compat.rs`. * Rename `stdweb` feature to `std_web`. * Move to gloo's `EventListener` and some polish. * Remove outdated comment. * Change `EventHandler` to be cancelled on drop. * `web-sys` html conversion (yewstack#817) * Converting all `html` parts. * Format. * Move general changes to different PR. * Removed compat. * Rename `stdweb` feature to `std_web`. * Remove redudant function copy. * Some polish. * Move to gloo's `EventListener`. * Replace `unwrap`s with `expect`s. * `web-sys` agent conversion (yewstack#818) * Converting `agent`. * Remove wrong `cfg` in imports. * Move general changes to different PR. * Some optimisations. * Rename `stdweb` feature to `std_web`. * Fix `ArrayBuffer` to `Uint8Array` conversions. * Add js module worker. * Use `cfg-if`` and `cfg-match` to make things clearer. * Fix `std_web` build. * Add some polish. * Add build guards for invalid build configs (yewstack#866) * `web_sys` cfg conversion (yewstack#862) * Use `cfg-if` and `cfg-match` and some polish. * Mistakes were made. * Missed line during rebasing. * Mistakes were undone. * Remove global. * Remove part of `global!`. * `web-sys` services conversion (yewstack#827) * Convert `console`. * Finish services. * Some polish. * Fix `ArrayBuffer` to `Uint8Array` conversions. * Fix aborting fetch leading to error and some polish. * Replaced some `unwrap`s with `expect`s. * Use `cfg_if` and `cfg_match` and do some polish. * Proper scoping. * Some fixes. * Move fetch and reader services to different PR. * Revert split. * Fix CI builds (yewstack#877) * Fix derive_props_test * Move tests (yewstack#897) (yewstack#898) * `web-sys` fetch service conversion (yewstack#867) * Split implementation. * Import global. * Import global. * Revert split. * Make fetch available again. * Revert "Revert split." This reverts commit 6e3f101. * Re-revert split. * Some polish. * Move to `wasm_bindgen_futures`. * Switch to `thiserror`. * wip * Update src/services/fetch/web_sys.rs Co-Authored-By: daxpedda <daxpedda@gmail.com> * Some more polish. Co-authored-by: Justin Starry <justin.m.starry@gmail.com> * `web-sys` reader service conversion (yewstack#868) * Split reader implementation. * Revert split. * Remove leftover files. * Make reader available again. * Revert "Revert split." This reverts commit 8abdc9c. * Revert "Remove leftover files." This reverts commit 188c6eb. * Re-revert split. * Polish. * Forgot some part. * Some polish. * Some polish. * `web-sys` examples/tests conversion (yewstack#841) * Fix examples/tests to work with `web_sys`. * Update `StorageService` usage. * Split `stdweb` and `web-sys` examples. * Fixing the shell script. * Trying to reset file permissions. * Update to new reader API. * Update to new fetch API. * Update to new fetch API. * Re-enable examples CI. * Deleted duplicate example. * Some fixes. * Fix rand build. * Fix spawning workers in combination with `wasm-bindgen`. (yewstack#901) * Fix component rendering process (yewstack#913) * wip * Fix component rendering process * Simplify yew-macro a bit (yewstack#902) * yew-macro: Simplify Properties validation * Fix most clippy warnings * Fix clippy warnings (yewstack#912) * Import Task trait in dashboard example * Remove duplicate vtag tests * Fix prevent_default() by non-passive (yewstack#958) * Fix prevent_default() by non-passive * Fix cargo fmt * Remove `Option` from most services. * Remove `Option` from resize service. * Apply fetch changes. * Apply reader service changes. * Fix `node_refs` example. * Remove web-sys travis branch Co-authored-by: daxpedda <daxpedda@gmail.com> Co-authored-by: Jonas Platte <jplatte@users.noreply.github.com> Co-authored-by: Jet Li <jing.i.qin@icloud.com>

* Properties 2.0 * Fix problem when passing a closure to prop_or_else * Update test names * Add support for building with web-sys (#961) * Enable travis * `web-sys` general conversion (#826) * Moved patches from different PRs. * Add bits & pieces and some services. * Rename `stdweb` feature to `std_web`. * Move tests and examples to different PR. * Revert some `cargo_web` handling removal. * Missed something. * Implement `console_error_panic_hook`. * Update Cargo.toml Co-authored-by: Justin Starry <justin.m.starry@gmail.com> * Move document creation to util convenience method (#855) * `web-sys` listener conversion (#813) * `web-sys` listener initial try. * Improve macros? * Remove generic from `EventListenerHandle`. * Fix build. * A cleaner solution? * Even cleaner. * Fix `build.rs`. * Minor improvements. * Following the yew toml style. * Fixing visibility. * Fix `rustfmt`. * Add `web-sys` re-exports. * Move general changes to different PR. * Remove compat. * Actually remove `compat.rs`. * Rename `stdweb` feature to `std_web`. * Move to gloo's `EventListener` and some polish. * Remove outdated comment. * Change `EventHandler` to be cancelled on drop. * `web-sys` html conversion (#817) * Converting all `html` parts. * Format. * Move general changes to different PR. * Removed compat. * Rename `stdweb` feature to `std_web`. * Remove redudant function copy. * Some polish. * Move to gloo's `EventListener`. * Replace `unwrap`s with `expect`s. * `web-sys` agent conversion (#818) * Converting `agent`. * Remove wrong `cfg` in imports. * Move general changes to different PR. * Some optimisations. * Rename `stdweb` feature to `std_web`. * Fix `ArrayBuffer` to `Uint8Array` conversions. * Add js module worker. * Use `cfg-if`` and `cfg-match` to make things clearer. * Fix `std_web` build. * Add some polish. * Add build guards for invalid build configs (#866) * `web_sys` cfg conversion (#862) * Use `cfg-if` and `cfg-match` and some polish. * Mistakes were made. * Missed line during rebasing. * Mistakes were undone. * Remove global. * Remove part of `global!`. * `web-sys` services conversion (#827) * Convert `console`. * Finish services. * Some polish. * Fix `ArrayBuffer` to `Uint8Array` conversions. * Fix aborting fetch leading to error and some polish. * Replaced some `unwrap`s with `expect`s. * Use `cfg_if` and `cfg_match` and do some polish. * Proper scoping. * Some fixes. * Move fetch and reader services to different PR. * Revert split. * Fix CI builds (#877) * Fix derive_props_test * Move tests (#897) (#898) * `web-sys` fetch service conversion (#867) * Split implementation. * Import global. * Import global. * Revert split. * Make fetch available again. * Revert "Revert split." This reverts commit 6e3f101. * Re-revert split. * Some polish. * Move to `wasm_bindgen_futures`. * Switch to `thiserror`. * wip * Update src/services/fetch/web_sys.rs Co-Authored-By: daxpedda <daxpedda@gmail.com> * Some more polish. Co-authored-by: Justin Starry <justin.m.starry@gmail.com> * `web-sys` reader service conversion (#868) * Split reader implementation. * Revert split. * Remove leftover files. * Make reader available again. * Revert "Revert split." This reverts commit 8abdc9c. * Revert "Remove leftover files." This reverts commit 188c6eb. * Re-revert split. * Polish. * Forgot some part. * Some polish. * Some polish. * `web-sys` examples/tests conversion (#841) * Fix examples/tests to work with `web_sys`. * Update `StorageService` usage. * Split `stdweb` and `web-sys` examples. * Fixing the shell script. * Trying to reset file permissions. * Update to new reader API. * Update to new fetch API. * Update to new fetch API. * Re-enable examples CI. * Deleted duplicate example. * Some fixes. * Fix rand build. * Fix spawning workers in combination with `wasm-bindgen`. (#901) * Fix component rendering process (#913) * wip * Fix component rendering process * Simplify yew-macro a bit (#902) * yew-macro: Simplify Properties validation * Fix most clippy warnings * Fix clippy warnings (#912) * Import Task trait in dashboard example * Remove duplicate vtag tests * Fix prevent_default() by non-passive (#958) * Fix prevent_default() by non-passive * Fix cargo fmt * Remove `Option` from most services. * Remove `Option` from resize service. * Apply fetch changes. * Apply reader service changes. * Fix `node_refs` example. * Remove web-sys travis branch Co-authored-by: daxpedda <daxpedda@gmail.com> Co-authored-by: Jonas Platte <jplatte@users.noreply.github.com> Co-authored-by: Jet Li <jing.i.qin@icloud.com> * Fix vtag test warning (#978) * Clean up exported apis and doc visibility (#977) * Clean up exported apis and doc visibility * Remove unused ScopeHolder * Change ComponentLink to alias of Scope * cargo fmt * update new examples to Properties 2.0 * Fix a mistake when resolving conflicts * Remove an outdated hack. Co-authored-by: Justin Starry <justin.m.starry@gmail.com> Co-authored-by: daxpedda <daxpedda@gmail.com> Co-authored-by: Jonas Platte <jplatte@users.noreply.github.com> Co-authored-by: Jet Li <jing.i.qin@icloud.com>

This was referenced Dec 27, 2019

web-sys general conversion #826

Merged

web-sys agent conversion #818

Merged

web-sys html conversion #817

Merged

web-sys listener conversion #813

Merged

jstarry force-pushed the web-sys branch from 4f25290 to 6357834 Compare December 29, 2019 03:20

daxpedda added 3 commits December 31, 2019 15:36

Convert console.

939d2ac

Finish services.

626cf9b

Some polish.

c8ac5c8

daxpedda marked this pull request as ready for review December 31, 2019 15:53

daxpedda added 2 commits January 1, 2020 23:29

Fix ArrayBuffer to Uint8Array conversions.

45fda39

Fix aborting fetch leading to error and some polish.

fd2df8b

daxpedda mentioned this pull request Jan 4, 2020

web-sys examples/tests conversion #841

Merged

jstarry added this to the 0.12 milestone Jan 6, 2020

Replaced some unwraps with expects.

8d49f0b

daxpedda commented Jan 9, 2020

View reviewed changes

src/services/storage.rs Outdated Show resolved Hide resolved

daxpedda commented Jan 9, 2020

View reviewed changes

src/services/websocket.rs Outdated Show resolved Hide resolved

jstarry reviewed Jan 9, 2020

View reviewed changes

src/services/dialog.rs Outdated Show resolved Hide resolved

Use cfg_if and cfg_match and do some polish.

84064d1

Proper scoping.

74825a3

jstarry reviewed Jan 12, 2020

View reviewed changes

daxpedda added 2 commits January 12, 2020 11:41

Some fixes.

231a025

Move fetch and reader services to different PR.

f4c6e1d

This was referenced Jan 12, 2020

web-sys fetch service conversion #867

Merged

web-sys reader service conversion #868

Merged

web_sys cfg conversion #862

Merged

Revert split.

7524929

jstarry merged commit c1f621a into yewstack:web-sys Jan 15, 2020

daxpedda deleted the web-sys-services branch January 15, 2020 14:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

`web-sys` services conversion #827

`web-sys` services conversion #827

daxpedda commented Dec 27, 2019 •

edited

Loading

daxpedda commented Dec 31, 2019 •

edited

Loading

daxpedda commented Jan 9, 2020

jstarry left a comment

daxpedda commented Jan 9, 2020

daxpedda commented Jan 9, 2020

jstarry left a comment

daxpedda commented Jan 12, 2020

jstarry commented Jan 15, 2020 •

edited

Loading

jstarry commented Jan 15, 2020

daxpedda commented Jan 15, 2020

jstarry commented Jan 15, 2020

web-sys services conversion #827

web-sys services conversion #827

Conversation

daxpedda commented Dec 27, 2019 • edited Loading

daxpedda commented Dec 31, 2019 • edited Loading

daxpedda commented Jan 9, 2020

jstarry left a comment

Choose a reason for hiding this comment

daxpedda commented Jan 9, 2020

daxpedda commented Jan 9, 2020

jstarry left a comment

Choose a reason for hiding this comment

daxpedda commented Jan 12, 2020

jstarry commented Jan 15, 2020 • edited Loading

jstarry commented Jan 15, 2020

daxpedda commented Jan 15, 2020

jstarry commented Jan 15, 2020

`web-sys` services conversion #827

`web-sys` services conversion #827

daxpedda commented Dec 27, 2019 •

edited

Loading

daxpedda commented Dec 31, 2019 •

edited

Loading

jstarry commented Jan 15, 2020 •

edited

Loading